changes from mumsee
updated packages
general cleanup