Added partially working GUI and some minor changes