cleanup + portable path issue is addressed