reworked

added a few indexes and reworked some formatting