Random changes and fixes

Improved startup
Fixed one message on startup saying @conflict at blablabla
More Update for 1.7.2