Fixed issues from the list, added block-style grouping