first of day. cleaned up a bit