bug fixes/cleanup
fixes