fix stupid bug coming from wrong class imported..
refactoring and cleaning up some stuff and fix encryption a bit more