Fixes, rewriting, updated screenshots...