Fixes and screenshot addition