First update, fixes major design flaws