Bugs Fixed (Release cleaned)