fixes/features from feedback, about to do debugging