fixes, overhaul, better sectionning, better packages