Changed some core files, and added 3rd-party libs