Fixed few buggs