- fixed some architectural issues