Fixes + better treasure system