Fix bugs and features. =)