Clean up objects, validate in stack, fix misc bugs