Changed stuff and had QA an changez