More additions; remove casts (ktnx fowl)
Rename module