Reworking of server/lib files; Updates to twostep