pushing fixes, adding features