Fixed a few issues and added some more packages