refactored custom
lost finder
merge admin scripts from upstream