Added stuff and bug fix!