mostly final touches