make fix
lots of changes. things are coming together pretty well