fixed bugs and added custom pushes