Additional features of admin int. plus a bug fix