Added intro and some bug fixes