tweaks
first commit
refactored whole thing, works now
merging mesh