Some new stuff and fixes.
Removed some files and updated some.