yeah, if you can just fix these two issues up this looks good to go otherwise.