Various fixes, english support, activity types