added forgotten final attributes to some classes; removed all trailing whitespaces