multiple bugs fixed