Fixed the init scripts and control file. Also, imported quentin's UNCOMMITTED CODE