Fixes + Additions