Bug fixes, integration with new register architecture