Merge with master

Did some debugging to make worlds slightly less laggy and made leaves a bit prettier