Minor fixes, add beast template