* Continue fixing bugs