updated package info, fix some code indenting