Improved web interface, fixed cli interface