Added some functions.  Fixed some (interactive)