Changed logic

Most everythign is working (no errors) but there is some logic issues i
want to change.