Added source and fixed tiny things