Some things working better

Most things still busted :-\