libraries added + some changes