bugs fixed and nacovism added