implemented beat + fixes