Fixed some mistakes. Add color fill.