Fixing errors
Trying to fix bugs