Thanks everyone - I will try to spend some more time on it this weekend and post some (hopefully) improvements.