minor patches to system and fixes #27 change pw feature