Fix some formatting and things that shouldn't be hardcoded