Added server stuff (for future use) and fixed a slight bug.