Small fixes and casing