update to RC4, cleanup, single jar build