Removed all comparisions that caused signed/unsigned warning.
Moved some includes around.