changed little things, cleaned up syntax