Fixed #126, Added more to scratchpad