Fixed package stuff, updated build