a few finer details in place now