Various fixes, including mappings -- thanks @Lrns123