Loads more bug fixes.
yay fixed