Some additions by Nokrath...

thanks :)