implemented push-only mode
+ fixed push behaviour
+ fixed other minor typos