fix!
remove some messages
wrap stuff in libraries