Added cluster generation and reporting capabilities
Fix some pesky bugs