Bugs fixed, some improvements