fixed issues with um...
final commit before rework