Bug fixes. Mostly working