Fixes, formatting, formatting fixes, things, stuff