good catches, will implement :)