worked on testing
added short name; changed icons