Feature/fix alpha bugs