Fixing errors and stuff