Refactored Classes (Changed FIXME's) and some trifles