Some other chap 4 tweaks

here it is
stuff

yeah
Merge pull request #333 from shaitanelnifi/master

some changes that need merging