even more simple
final fixes