Feature/bugs