cleaned up size macros
changing keyring from type to a manager
finished updating signature