Fixed Bugs, Added SAVE functionality