some fixes, abstract user changed int to Integer