Tons of changes since 5 months ago

Lots of fixes, updates, etc.