Added Screenshot capability and a few small

naming fixes