Initial updates to forked sourcecode