more cleaning on the gallery and added a return