bit of cleanup, comment out profilers, resolve compilation warnings
correction
added more test forms