Fixed some issues - most of this is experimental