Tidied up, closed #1 and closed #2