More error handling, layout tweaks, and updated readme.