Done! ...with some fixes