Fixed a coupld minor bugs. Everything working now.