magic number tweaks, added more data