bug fixes, and added more groups so directory is better to test with