fixed some annotations and cleaned a bit