Cleaned up some commented code. Tested reviews a bit. fix #19