adding messages push support
minor fixes