changes regarding new push feature and minor biug fixes