Cleaned up wordmaster more, moved io to skeleton