fixed timeout bug. added start and stop commands for servers; also rearranged makefile