Various fixes
Added screenshots