now context feature works well
minor bugfixes