Added showmessage command & small changes