Settings fixed, startup fixed, minor cleanup