Minor fixes on both sides
Added new fields :)

finally some perceived benefit