Add reseed function, argument support to hooks; Query cleanup