Bugs fixed, code cleaned