mostly updates to main unveillance class, some bug fixes to Models