[dev] Added frame indicator; fixed minor bugs