removed some annoying abbrs and added some xpt snippets