Small fixes

Some fixes.
Yes func is better. fixed.