fixed a bunch of minor bugs and wish list items