Added hyper/mgr logic. Fixed formatting and a redundant eval_db() call