Remove trailing whitespace, implement skipgroups
Preliminary support for dynamic resolving