merging recent changes to vraow fork