A lot's of changes and bug fixes.