minor tweaks, spelling errors. workign now, altough very ad-hoc