switching from BaseException to Exception
mass refactoring and such crazy stuff