Fixd bugs
repackaged