relegated debug statements insertion to yasnippet
updated todo