fixed misc bugs & removed old methods & merged some emitteds