Small changes

Still a drawing bug...