alpha bugs fixed