Added some mappings, fixed minor issues