Added Screenshots and some bug fixes