Several fixes and increased readability