update + fixes + jorith additions