Debugging; Finishing touches