Fixed a couple bugs so it is now in basic working order...