Continuing restoration

Some Clean up and made an even more awesome find-pc in mysettings module