Bugs are fixed .. Almost