remained bugs fixed