reworked random stuff
Merge origin/master