combined my and joe's projects fixing errors