refactor!

also included libs