syntax fixing, I really should run these locally before commiting. Also I think this is an unstable build