Updated things to make them work
Updated settings and libraries