Added a bunch of comics, error handling, layout changes