parse for body as well now
misc small fixes