not trying to address all style questions but I'll fix those too