almost there

adjustments to multiple files and some minor cleaning
moving towards a functional admin