Missed some files, plus bug fixes