Secured and made some things better