fixed stuff, works o.k.