features, fixes and stuff