MOAR MINOR CHANGES