Fixes + some new