fixed lots of stupid little mistakes