personal feedback more bug fixes