Alfa-2

General Fixes