changed & updated code in various classes