fixed badness & stepped into the 21st century