minor fixes, but still nowhere close