cleaned up and adjusted prop settings