Minor changes. Fix some errors