Feedback block, minor bugs, code cleanup