Fixing my own bugs! yay!