added comments; fixed loading issue