Fixes + some strange bug in middle of fix