Changed package name
Cleaned up some warnings