Bug fixes to new architecture... tested and working.