V0.5b

General Fixes