Cleaned up some code, and added groups file to include list