#129
fixes #130
fixes #131
fixes #132
fixes #133
fixes #134