Fix some bugs! They now work!