Final fixes, included updated dist directory