Fixed some group thing, and cleaned up some small things