Fixed some inconsistences