fixed final misc things