old commit, general bug fixes and some basic front end work done