Minor improvements, and forgot something :P