Fix minor issues. Ready for public