#41, syntax, casing, and reverting some