-fixes + error catches :D