fixes #8, added new code for currentw view