Fixes + new functions