Last fixes, added comments, critical time