minor fixes, cleaning up