fixed some small bugs, removed PW support for now