Some bugs fixed... Some still left