Fixed a couple warnings
Fixed a merge conflict and cleaned up warnings.
made some classes final