Now to bug fixes :D