Finished cleaning, added flags and such... a LOT of cleaning!