Overall Revision

Please test.
 - Fixed typo
 - Exchange Classes should be final
 - Overall changes to satisfy my pickiness