Removed other pool stuff, fixed variables