+Fixed some gaps