Improving admin and more fixes