Newest bug fixes;