major changes

will edit description later-on