some fixes...
final commit for AP 1