Bug fixes and some gui work.. mostly working as is, but more features before first build release