Removed some log statements, tweaked some values