Small update and fix compilation problems

Removed non compiling activty and small changes