Merge pull request #2 from nyxcalamity/master

cfd:ws4:misc adjustments and improvements
cfd:ws4:pre-final