added base_object and fixed a few bugs