merging back smaller bugfixes
version push