cleaned up some presentation stuff, other misc bugs