Fixed a few bugs and added a few more arch deps