Improve feedback

This might be a bomb :D but then again, it's not meant to be run by users in the first place :D