Last round of bug fixes (hopefully).
there are many changes since last project. I'll send you the new project at your email if you'd like to check it out.