Edited files for bugs