Testing

Testing functionality and fixing reported problems. No reply required.