fixes #266
fixes #265
fixes #266
fixes #268
fixes small bug
updates #267