Bugs, architecture fixed