Update with pretty debugs and fixes