staging feedback
fixes