Several seed fixes and increased readability