Fixing stuff I wrote over