Added autostart; cleaned up including