fixed last two problems