Improved architecture handling and bug fixes.