small changes. removed wanrnings with @Unused...