Fixing up inconsistencies
Adding missing files