Minor changes.
mostly working