10 sec update & Minor fixes