Removed an impressive number of warnings
Uh,...
SPAAAACE!