Cleaned up a bit of code. Fixed package data.