added validation rules
bug fix
made bundle standalone
made bundle standalone