fixed update bug, finalized notifications, removed debuging code