Mass bug fix update