Test and fix and make it pretty