Remove debugging output. #15
Fix bugs with prefix/storage parsing. #15