implemented availability push + small fixes