Checkin for issue # 5 plus general fixes all around