bug fixes, added data, made prettier.