Huge Update fixing and adding several important things