#fixes and features
#fixes