Feature/bug buster