added oome handling, bumped memory