fixed some config & packaging issues