finished functionality for web version and fixed service