Bug fixes, slight updates and linux integration