fixes,cleanup