adding milestones, did some bug fixing