More bug fixes / feedback changes