refactoring and fixes, b14tch3s