Basic update, few remarks about style coding.