Fixing stuff- @ess090502 please don't read desc

Please don’t work on a different feature before you fix the current one.