legacy stuff cleanup and runtime issue fixes
Merge pull request #7 from mabrosim/cleanups

legacy stuff cleanup and runtime issue fixes