Updated show functions and fixed minor bugs