fixing up some stuff ... more later