Cleaned up the code, did some real consistency testing, plotting snapshots with Gnu plot, the system is stable and consistent