Set on boot to 1008 and some minnor changes