added thin server and other changes