Fixes + more smart initialization