updated seed file, cleaned up some code
merged master