Fixed some issues. Probably created more. :-)