fixes and cleanup
fixes