added more terrain stuff
fix merge
fixed level gen