beta .08.2

small changes, cleaned & commented code