Bug fixes and kick function added