Final bug fixes requested by Decodeal