Bacground added + some minor fixes