added serveral things