more updates and improvement re: feedback