Push + Misc Bug Fix