Complete DDA Merge

I synced up the files with the DDA files to keep differences to a minimum (mainly extra whitespaces and indentation) so future merging with DDA should cause minimal conflicts. I also added my cyan windows cursor.