Fixes, changed architecture