small fixes... just need everything to work before I do code cleaning