responsiveness & fixes

Signed-off-by: franszo <josh@kishandchips.com>