Bug fix + code checkers