improved collision perf
added save option to config
simplified and improved water logic
Merge pull request #31 from es92/master

Add changes