added libs and improved entities