made modifications so that everything is spacced properly