fixed index issues, fixed color