Memory watches added, many minor bugs fixed