more cleaning up/fixes