Improve startup script...