Fixed random seed issue
Cleaned up some includes