Net creator - some bug fixes