some fit and finish fixes