major improvements, added features