Fixed few bugs, bugs still remain