Extend screenshot feature & cleanup

This is a follow up on #62.