Finally! Tightened linecount, added copy, amongst other things