Various updates
Updated to relative paths