Made things prettier and added more load cases