Fixing bugs and stuff from HabitRPG