fixes

topic 1