Added assets folder handling, Added watch, Fixed typos