fixed getter bug, refactored some emitters