fixes + added ability to @:ref("Model")
bunch of stuff