More tweaking particle-solid constraints stuff