Cleanup and small corrections