Only small improvements (removing unused imports, adding TODOs :P,
improving some Methods) 

so nothing to care about =D