Massive update: fix bugs, add edit option, add messages output