Initial commit
Additional tweaks for ambiguities' sake