event emitters, code cleanup, & skydock support