fixes and improvements following paign10.ln's feedback from https://groups.google.com/forum/#!topic/p-space/K10Ve5AsNhs