Fixes and enhancement

push